Use bit_opts like in the other methods, and add a <<0 as requested in PR 419.
Collapse, spell check and remove some // comments.