The initial work for this has split off into NAP Refactoring, which will also set the foundation for Improved NAP terms.