- Fix `BATT_SUPPRESS`/`BATT_UNSUPPRESS`
- Add useful diagnostic information in a bunch of places
- Fix some build/test regressions in Debug builds