More refactorings to standardize identifier/keyword "make sure it can't continue" behavior"