Decomposer is now covering all cases (ValDef was unfortunaltely
not there).