Fleshing out code gen a bit more