The current spaghetti code confuses some versions of gcc (and just
looks ugly as hell)! Clean up...
Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>