Finish refactoring observe/ forget to use new getmake_then and findnode_then