This has been verified to work, at least on a quick test.  Need to test
more thoroughly.  Good for a beta release, anyway.