tuna: commonize what we can (2/4)

Change-Id: I9b38185aea5b7ebe9abed55dcb5b42927e43c36b