removed type macros from lexer