More MFE pruning that should have been in the last commit.