Patch Set 5: No score

I have no idea what's changed since the last time, and I really don't want to step through each file again to see if it's what I expect. If the only change is that we're using the constants defined in HttpSupport, then that's fine; if there's anything else, please let me know so that I can review.