A bit of tidying, including updating copyright dates in comments.