Get rid of some unnecessary intermediate structures
Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>