Merge "Clean up write_tx_type()" into nextgenv2