Tidy up the handling of wild-card binders, and make Lint check it