Whitespace & coding standards adjustments to Evan's last commits.