Progress on unifying builtins. Things started to parse now.