Tightening changes

-idiom equality override cleanup
-introduced indexing decoration placeholder
-decoration hydration broken into sep class