Fix P2SH scripts not recognized as addresses.
Minor code simplification.
Fix potential NullPointerException/IllegalStateException when comparing addresses and amounts.
3.33