Replace all i32 returned by enums::Value when necessary