Fix backwards-compatibility, also for Travis' Vim