(This patch ignores white-space.) 

Here’s the patch with white-space changes: