"make syntax-check" detected various minor problems.
This patch fixes them. They're all trivial, but I will wait for an ACK.