Crypto shenanigans. Minor cleanup.