Fix indentation bugs from earlier Xcode betas.