#3 Container::singleton renamed to single.