Step #2 (separate for better bisectability): renumber so the silly '-1'
goes away.  Pick a range which doesn't overlap the old values.
Signed-off-by: NGerd Hoffmann <kraxel@redhat.com>