Bka state cleanups2

Simple, already reviewed commits from !461 (closed) that make no behavior changes.

I hope that this can get merged easily and my diff shrinks.

#15173