Small tweaks to use Guava predicates instead of homebrew