A few more trivial changes.