Added a couple more special cases for formatHeaderName.