Obviously unrelated, but was necessary to pass `make check` after rebasing.