More tidying of configuration injection.