Merge "Fix virt-specifiers outside class definition errors."