Correct various syntax issues.