Fixed more C++-related type-analness