replace <punct> with <scan::_ascii-punct>; other tweaks