Move optional property checking to the grammar checker.