Simplify treatment of the copyright notice, now I've also simplified