rej14: Fix some unharmful code not using formula vars (but equivalent)