Misc minor syntax fixes.

Misc minor syntax fixes.