Completion for a couple more vagrant aliases.