Merge "Revert "Use single-argument form of firstKeyOf()""