More vim cleanup.