Restructure and make rules 2 and 4 unconditional
Merge pull request #90 from sipa/bip62up

Restructure and make rules 2 and 4 unconditional