Partial syntax fixes.