Fix item unit dispatch function not using natural keys.