Some cleanups, based on a patch from Ken Chalmers