[2.2] More plan rewriting