More b5 fixes and remove reliance on __conversion().