Restored code completion. Fixes #471