We can probably get rid of these; they should be removed in the normal loader too.