Attempting to fix some stuff, but tests failed, so I checked out master and got the same failure: https://paste.lugons.org/show/LOhSDsPFKWcMlp4dWZxo/