TooManyRepositories post: various changes advocated by @senny.