Address two possible places causing runtime warning on a GSource removal

That could generate "Source ID xxx was not found when attempting to remove it"
on a g_source_remove() invoke, when an already removed GSource ID had been used.