No changes of consequence.  Experimenting with Guava Tables, Predicates,
Functions, Collections....