Less-annoying singletonness, some refactoring because less calls/spaghetti the better.