Refactoring to simplify decorating/allocating.