Removing implicit decoration

Instead of relying on nested decorations, instead pushing decoration
up at the controller level.