... parameters to make it clear that they take ownership.

Change-Id: I572c5fa6268438a86d0a4fa1d2aef15382cb5607