This avoids the fugly pass by reference and makes the code a bit easier
to read.
Signed-off-by: NSage Weil <sage@newdream.net>