debugging: Fixing scope for rewritten functions
debugging: Extending debugging to system functions (fix)