Split off extension point for MNMs. Actually seems to have made things slower by more than I expected - will try evaluating.