Materializer refactoring.