Tweaks to command mode completion