AC-7999. More refining of the syntax checking.