Fixup and cleanup b2math.