vim: minor rearranging, removing old cruft