Lift restriction predicate expression.
Switch restrict definition into method.
Switch restrictJoin type.
Merge class interface updates.
Rename into unsafe name.