Improve handling of alternative vims.