concurrent fix for package editing also cleans this up slightly