am 82efc941: Merge "More simplification"

* commit '82efc941ba88e680765dac8f34d307780f6527d1':
  More simplification