Enhance NegatedIf and NegatedWhile

They now handle properly `unless` and `until` constructs.