Unwind one level of cluttering indirection

Change-Id: Iceaed0e5490b6002c1421d74dfb8f2d0ba38cbf5