It's in a separate branch, and it's "noodling" as I said.  The point was to make the emitter code way more readable, but you're right, it can end up in yak shaving.  That's why I didn't do it in the same branch.