A bit more rearranging.