Simplify parser; use ListBuilder