Minor clean up to Config role.