Revert "refinements to c++ completion tab handling"

This reverts commit a37c8e253a42b536f30c40c1c1e4d40bfa08c256.
refinements to cpp completion tab handling