Added expression-handling specification.