Refactor|MaterialVariant: Minor MaterialVariant cleanup refactorings