This should probably run after the NamespacePass, right?