Generic static adjustments

These changes are necessary to build the generic-static2-mb branch of d-p. Removing Inject is optional, but it is pretty much cruft at this time.