Yet more cleanup of boltztrap.