am b93581f8: Merge "Refactor code in preparation of correct stack maps in slow path."

* commit 'b93581f857e36a62f690e26e78167f2abea0f033':
  Refactor code in preparation of correct stack maps in slow path.