Use HasAny instead of HasFlag for the new notFlag check in EntityFlag_Toggle. It turns out the answer to "does something with no flags set have a flag which is no flags set?" is YES.