Thanks to Matthew for sorting this out. (Also removed a bunch of line-ended space chars since git yelled at me.)