bugfixes for the guarded data flow analysis