Many small fiddles with language, which I hope further increase readability.