Don't use val_to_Z_Some_inj and add wp cas rules for int and bool

2 jobs for ci/refactor_int in 27 minutes and 45 seconds (queued for 3 seconds)