Slight design tweak to ItemOnItemEvents, more robust.