Older FOR and IF structures are handled properly, but enhancing --removekeywords was apparently forgotten when WHILE and TRY were introduced. Other control structures cannot have body in data, but it's possible that e.g. listeners log something that ends up inside them and thus they have a body in the result model. Need to think do we need to care about that and clear them as well.