Fix the battery checks.

I have *no* idea how that even seemed to work, but in fact didn't.
Also no idea where the hell is the battery status supposed to appear in
the menu, because it's currently not there.