WIP hygiene for itemfns
DONT LET THIS COMMIT GO UPSTREAM