Undid whitespace modifications, again to minimize diff.