Refactor: moving ItemAdd() into a section abote ItemSize(). No logic change (part 2)

Diff not ideal (in Fork it looks like ItemSize is moved) but understandable at a glance.