identifier matcher corrections
Move the more general identifier check to end