Merge "Remove spurious `@class` tags in two files"