tuna: commonize what we can

Change-Id: Ib552d710a60f2c6355908191289fcd9bbbab7532