CC parsing fixes. Etc.