Some more bionic fixes.

OK, though I'm not seeing any side effects from this in trials against zombie-fighting pain.  Will test with some BEES!