Imenu support
Stop company trying to complete with the same string as being typed in, and don't try and complete class names with closing ().
Removal of failed imenu attempt, and a small amount of tidying up.