Done splitting bionics.

Batteries are still the only special case.