Moved some code around in Glance configuration framework.