Cosmetic changes only in this one (hence the reason I wanted them kept separate from the the previous changeset).