#170: more minor language changes