+PeteK : Make sure produces and consumes take vars