Minor optimization to the AutoLoader