core: remove some more parametrized module references. Issue #513