[Echobase-commits] 06/07: Simplifications