Cleanup: rename enclosing-seq => enclosing