Remove one level of nesting where appropriate.
Signed-off-by: NJens Axboe <jens.axboe@oracle.com>