Bring token request and response formats into comformance with the RFC.