Spec improvements (mostly for traversal)