I've sent all updated patches to their respective NNN@debbugs.gnu.org.

Sorry for the mess :(
(And I hope I didn't make it any worse.)

-- 
Pierre Neidhardt