Fix things up so module loads are instrumented

Instrument module loads, next up spawn_opt and a few other things