am 0f72e413: Improve heap verification.

* commit '0f72e4136aecaf6976fdb55916bbd7b6d5c9c77b':
  Improve heap verification.