BSD contributor count automation and some cleanup