Simplify object and enum rules