Mostly to get rid of a warning.  Tests still fail.