Merge "Refactor KeySet code."