It feels like it might be time for a single generic pp registration mechanism that is used by everything we already have. However, that doesn't necessarily need to part of this PR.