[cbe] Combine methods by using if rather than singleton dispatch.
Merge pull request #731 from waywardmonkeys/remove-some-singleton-dispatch

[cbe] Combine methods by using if rather than singleton dispatch.