Once again, getRightThis in the front-end is hurting us. This will complicate the area where the codegen should be handling this by ten-fold. I'll see what can be done in the meantime...