A couple of small cosmetic changes.
Pull in some changes from the check-tex-timestamps branch