Low hanging fruit

Some refactorings, primarily removing `values` and `keys` direct use, replacing with `keysDo:`, `includesKey:`, `valuesDo:`, and some more similar changes, related to the former.