[#3386] Minor language tweaks