Log Message:
Reorder some lines to match standard order more closely.
Remove superfluous url2pkg-marker line (should only be kept in first editor window,
not when committing).