@cpcloud is it worth it to fix the trailing whitespace? Easy to remove the fix, but it was bothering me a little.