Reorder things a bit.