am 39109a06: Merge "Ensure the graph is correctly typed."

* commit '39109a06015c91188232e59fa9e60e0915d24cd7':
  Ensure the graph is correctly typed.