Clean up some code around the store V, (cast P) -> store (cast V), P