Fix some hierarchy class tags that I missed in the last commit.