Some more tweaks for how bulk loading is handled. Doesn't really
change the functionality but I think it's slightly more elegant on
the backend.