Simplify store logic.
Simplify more store logic.