fixes to method->subroutine mapping