Implement CSPRNG in a manner consistent with the feedback on #131