Yet even more $Id$ removals and a copyright bump