this is not too bad with the existing codegen, no?