Code

diff: avoid repeated scanning while looking for funcname