Let the people splice patterns into vals
Fix tests