Fixed ppmpf range inclusions, more legacy removed.