Merge "Refactor the inliner."
am: 4a69a30120

* commit '4a69a30120ecba9431246938e124d56213447137':
  Refactor the inliner.