OK, this change (aside from the total street count) is going out now
This thread has some other good ideas, too:
