Fixed yet even more code completion bugs.