Fix indentation and comments.
Merge upstream changes.