More tweaks to do with store update operations.

I hope this is it.