Refactoring MPE, VWI and USI/TWI to reduce footprint.