[master] More natural order in effects