Working on the taxonomy mess created by the shell script upgrade.