Improve the fix for issue #317823, which was not using a strict equivalent of...

Improve the fix for issue #317823, which was not using a strict equivalent of the Analyzer algorithm (the labeling of the subroutines was depending on their order of appearance in the bytecode sequence).