Add in some changes that were lying around in one of the working copies.