Tidied up crypto_stream_salsa20