Spawned by @pbhattar's request, here's some code that should add most of the outputs she was asking about, running on a JETM2 derivation. I also added a test for it, since we didn't have any regression for JETM2 before. Might also be interesting to @jbarr, maybe even @svanstro!