Cleanups in the license and extractor code.