Improved completion in variables.