Further registry cleanups.