Fix for expression auto-completion.

Code :-)