To simplify some code move the unit emission into the holders.