Mostly cleanup of RFC 2231 decoding. Also changed the API when I realized that
ES6 maps makes everything AWESOME.