A little clean up in the loader for #31.