This was a lot easier than I thought as I didn't realize I had only used
it in one place (according to GitHub search) before #137.

Fixes: #138