Inline _do_join as it now only has one caller

Also, consistently apply rate limiting.

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