lrm: wrap control structures table, add when