A small tweak for bug #7864.  It now correctly puts 'multiple units' on the last one if more than one unit is present.