Various batched changes to crypto.js