simplify some builtins
parser.ss largely working...