Another place where KeyNumberSet should be used. (dm)