Small refactor to make room for Crypto class.