Properly distinguishes between hex numbers and identifiers now