5815: Refactoring
Fixup decorate-last-model