Fixed some bugs in the redundant base qualifier issues.