More code reordering.