Finished migrating to the simpler equivalence of ornaments.