Further refactoring of ProcessPart and adapting to it in modules.