Generalize Observable

See the first commit for some discussion. This adds a few new TODOs. Only checked by running the unit test, hopefully someone with an unfolding setup at hand can run a more complete test.