More cleaning up of lazy loading.