A few more cleanups. There appears to be a data race on module load/unload.