Work towards bug #7468.  The base/ directory is now all converted.