Add -B prefix support. Small consistency cleanups.

3 files changed