making in-Firefox instrumentation easier to distribute
started to revise merging of types (not yet finished)