Code cleanup. Better signature matching for jump to source.