Prefering explicit decoration

Instead of the controller imperative, prefer explicit decoration.
There is a performance hit but that is acceptable compared to the
improved expressiveness.
Working on Header deposit information