Improve parser coverage