Expression combiner almost done, disabled declaration resolver.