#390: More minor language changes