Merge "Fix clang warnings about struct vs. class."