Made completion a little bit better and not choke so much on common code.