Improve built-in function capturing