Merge "Reduce some nesting in CryptRand.php"