More syntax fixes found during synthesis.