Refactored for signer converter and tests.