extra, function_hooks, db: change cross function analysis for returns