Fix auto-complete when final argument is a cliff-hanger