Update where clause predicates and change lifetimes to not have bounds by default