Inlined a function that was only used once.
Replaced complicated creation with copy-and-update

method calls.