am a828f613: Merge "Some more simplification"

* commit 'a828f613a8dfbeff6290f261bbbd5ff988fb99b6':
  Some more simplification