SPDY: code cleanup
Merge pull request #1927 from jpinner/spdy_cleanup

SPDY: code cleanup