Picked up my 2016 MacBook Pro from its 2nd top case replacement today. Maybe it can get another couple in before the keyboard repair programme ends.