Cleanup recursive subroutine fetch in isolate
build