Fix Trac #3965: tighten conditions when deriving Data