Move ThenIf to GenericExtensions