Price set not diplayed the same for first and additional participants

On an event registration page that allows multiple registrants with a price set, the price set display is not the same for the initial participant and the additional ones.

Apart from the cosmetic differences, this seriously complicates any extension script that attempts to show/hide price set options based (ie. Family, table or other 'registration pack' offered on first page, and if chosen additional attendees do register for free since already paid for by first registrant).

I have traced the issue up to the template file CRM/Price/From/PriceSet.tpl, line 33: this test is true for first registrant, false on additional regsitration pages. So the first registrant's price set is displayed by lines 34-58, and include the '<div class="price-set-row [...]>' markup, while additional registrant's price set is displayed by lines 62-74 and do include a much simpler markup.