Fix formatting.
Restore the 'B' type by https://github.com/gcflymoto and add tests.