More munging for remodularization