Differentiating type for Salsa20 master state, for consistency.
Fixing warnings.