vim: some minor rearranging.