Properly resolve expressions