Re-insert builtin blocks.
Minor generator bugfix.