refactor ReferenceExpressionResolver
lint-o-rama
fix ReferenceExpressionResolver rebinding