Add @ismatch, simplify some expressions