• Corrected scope handling so that locations are not always in scope.
  • Made CANCEL accept expressions.