Updated taint class to allow call site plus var taints as well