[protocol spec] Reduce the specification redundancy between decrypting with an ivk and with an ovk

[daira]

This will help with draft-hopwood-remove-consensus-dependency-on-note-encryption, but it's independent of that proposal. At the same time I will fix #740.