Remove some unneeded Option wrappers in the main context channel
Remove some unneeded Option wrappers in the main context channel

The receiver still needs one as we need a) a Drop impl and b) need to
take its value out of it when attaching.

rust-gnome/glib