More MDF2 refactors