Trivial changes (mostly comments).