am 33578eaf: refine some transformation rules

* commit '33578eaf140b8eeb5dad6e0c015b2e204054a86b':
  refine some transformation rules