Fix issue with function parameter autocomplete being screwed up when contracts are present