Bootstrap: continued codegen