Do partial revert of the previous commit (restore DeferredModuleNode), simplify & optimize code