Removed use of eager singletons.