[#3399976] Fix OPT_IN_* scope.

Opt in testing of additional branches may not be working. Add missing variables keyword and clear out misleading comment.