Fixes for clang++ compiler.
(#420)
Move a few other magic numbers into sbp namespace.
(#420)