Some more rearranging.