SQUASHME: fix nits
SQUASHME: Use BIP70 string identifiers