Various trivial changes.