#390: Last minor language changes