Singleton AppRegistry.
Minor clean-up.