Add return statements support to the CFG