Minor changes, part two.