Simplify counting of P2SH sigops to match BIP 16 (thanks to Matt Corallo for promptin...