I agree. While doing it I noticed that this branch is based off a pre-`http_status`-removal version, so I'll need a quick rebase before affecting the change.