Escape just identifier, refs #7171