Restore more old Git completion behaviour.