Adjustments to code completion for issue #32