Cleanup canonical message handling for signatures
More consistency changes
Merge pull request #134 from Robert-Nelson/another-signature-fix

Another signature fix