Fix expression wrapping for update part in loops