Bugfix: Remove dependency on <TPL>_WORKS variables
#836
+23
−18
<TPL>_WORKS variables
#836