Yepp, I try to replace them as I find them. And we'll even be able to get rid of our own `newHashSet()` method once we upgrade to Java 7 (whenever that will be) :)