Minor save_states.cpp style improvements.