I don't know if this affected anything, but it was subtly wrong. Also reorganize the loads to match, for consistency.
d34418100b