(Xronos) Adding a better constant propagation, slight modifications