Dry'ing up the crypt lib a bit