tuna: commonize what we can (2/4)

Change-Id: Ic200add412f31b027ec831c36886eeee2988d0c5