Allow quoting variable completions
Fix local vars in _matching_variables