Add debug log when re-lexing during error handling
Include '_' in '\w' regex character class
Remove some macros from public parser header