Get rid of xt dependencies
Add support for 2.1 required keyword parameters
Actually test the if predicate