This first part is jsut whitespace changes; I tried to remove any of these that crept in, but couldn't get rid of these. I think the source file has a mix of windows and unix line endings, and my client is getting confused.