Minor syntax and style fixes.