Working on const and type completion

Which brings me to the quest of smarter define statement completion.