Prepping for a better list parser
Adding more builtins, fixing some tests.

Jury is still out about auto-mapping.