Also, consistently apply rate limiting.

Again, ugly, but a step in the right direction.