Refactored, harder, for beta 4 compatibility

Builds on @vmartinelli's great work in #1422, but this also tweaks the access levels for a few things and strips prefix underscores now that we have Real Access Control™.