Clean up the pubkey-to-fingerprint conversion a tad