Make battery/diode layout more conventional.