TxBuilder: re-order functions to project standard