A simple threshold would resolve the former (say, $10m), though I'm not even sure it's required as that isn't what a mortgage interest deduction is.