Fix #795 "fr:grid doesn't evaluate remove-constraint in context of iteration"