Misc fixes to user-part parser