Fix various whitespace and indent issues (no functional change).