See keys as graphs, and other changes.