Getting closer to constant propagation