Here's a commit to solve this TODO, you can just squash it into your commit (or just add it):

https://github.com/stig/spray/pull/1