Various changes to make bootstrapping the framework more configurable.