Add a `restrict` locset expression type that returns all locations in a locset that are in a specified region.

Also allow region and locset names with hyphens.

Fixes #1031 
Fixes #1032