Prepare for s/static/const/
Merge pull request #78 from alexcrichton/update

Prepare for s/static/const/