I attempted to do a fresh checkout and build just now, and found it was failing 
with a variable-maybe-used-uninitialized compiler diagnostic.  The attached 
patch fixes it.  OK to check in?

-Sandra