Cleanups.
Improvements to the salt state.