Use the new helper functions instead of open coding.
Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>