Smartmatch more often, allowing more fancy name constraints