Rework codegen for star/plus operators. All tests pass now.