Merge "Cleanup: keySet() never returns null"