More reorganization. Removing access by applications to certain forbidden internals.