Enable dissolve
Fixup dissolve.c
Get rid of the last instances of sectortype in the code.