Better completion for C++ code. WIP.