Tidied up defaults loading.