Done in 0fa9db1762ec9fb93e0aee23cdd5c2a421ed45aa (will squash & repush PR when I finish everything).