Cleaning
Update "ornaments" etc to use new phrase-traversals #200

Fixes regression