Add support for the txbolt protocol. Assign f1 and f2 to choosing the protocol.
Use or instead of plus since the header bits can be set multiple times.
Fix mapping of -Z