Minor changes

The diff looks huge, though. Why does re-sorting the file introduce so
many invisible changes?
Added Spotted Pony