Further cleanups towards RFC 7230.