Merge pull request #1587 from KhronosGroup/refactor-active-variable-consideration

Refactor active variable consideration