In my opinion, the patches are semantically correct. However, not all dead code has been removed - I'm referring to pgstat_update_snapshot(). Also, the tests need to be fixed.
--Best regards,Ilia Evdokimov,Tantor Labs LLC.