Add -C/-c to help output and merge -b/-B while here.

(cherry picked from commit 9bbf7043323463f53067d1da89a04c3eeda28fa8)