Fixing rule condition dependencies to work with deep expressions