Minor cleanups, refactor RateLimitExecutorService.

Diamond operator is JDK7.