Refactor|Materials: Minor material system cleanup refactorings