Some minor shuffling of whitespace.