This removes a fair amount of specific code that is just as well
handled by the generic symbols completion code.