am d0c3398e: (-s ours) am e4e3f20f: type definition for future compat.

* commit 'd0c3398eb4d3e635a74be63e2bbbb595798b6d1b':
  type definition for future compat.