More indentation changes and other subtle details.