Refactor|MaterialBind: Minor MaterialBind cleanup refactorings