codegen, pretty: separate out pretty-printing, start +