More idiomatic parsing
Improved branch coverage