Did some more work on the identifier detection. It should work now,
except for not catching every example of an identifier. For example, it
would catch "ident" as an identfier but not "?ident," so we need to fix
that.