Factorize code of predicates (eg =<) to use a closure for the real
numeric calculation
Cleanup