Improved inout handling in equiv_make