Multiple issues with editing block fields (phone, email...)

We've come across multiple issues editing contact information following the changes introduced in CRM-10551 to 4.7.

So far issues affecting phone numbers and email address, particularly when a contact has two pieces of information at the same 'location' (ie: Two 'home phone's, two home emails).

Issues include:

• Unable to change which is primary
• Unable to delete fields from contact > edit

I'll update here once I've look in to it a bit more.