Use -1 not None for closure/destroy indices

Don't assign None to closure and destroy indices in case of
collision, they are supposed to be numeric.

https://bugzilla.gnome.org/show_bug.cgi?id=617978