Parser routines no longer using global variables