Parser granularity improvements