Interim refactoring to simplify the TxAck code and introduce the AddressN map