fix: Batch 3 — Parser strictness improvements (#296, #300)

fix: Batch 3 — Parser strictness improvements (#296, #300) #659