Distinguish lists from entries and simplify parser state
Reorder cases for more logical flow