Re: Remove if/else for shift/raise (issue 573770043 by hanwenn@gmail.com)

[jonas . hahnfeld]

LGTM (provided there are no regtest differences)

https://codereview.appspot.com/573770043/