Make more NEP1 compliant.

This might just be last release with breaking changes...Famous last words, I suppose. See RELEASE-NOTES.md for details.