Various syntax cleanup