Unified builtins2

Cool! And the other missing cells are completed using the context abstraction as before?