Further indentation improvements.