We're not enabling -pedantic by default, but a quick test brought up a few issues that we should fix.