Readability improvements. This implied some API changes like Divert<proto>Header structures are now just <proto>Header.