* Fix the reformat script to work with recent changes * Fix the convert-nei-dump script to remove leading and trailing '_' * Fix various broken tests