Fix fucked up merge -.-
Fix single underscore lexing as a number