Fix dtor names, empty if blocks

Detected by latest build of Vala.  Correcting empty if blocks seems
to correct harmless bugs.