Tidied up crypto_core_hsalsa20 and crypto_core_salsa20