vim: minor rearranging.