Fixed bugs in completer due to parser changes.