More wordsmithing... [skip ci]