Fix more uses of deprecated variable reference syntax