Have you run `make test`? I would expect this to break some of them.

Talking about tests, this PR needs one.