Old redesign to use two-parameter Has class
Tweak class parameters once more, for better error messages