Some improvements to the identifier parsing