More trivial changes.