Attempt to improve saved states, but fail for now.