Cleanup for OneAnd traversal derived from ce9e5e5.