tuna: commonize what we can (3/4)

Change-Id: Ibb366cc3a4cec98b08bac8299c5022d68426fcf2