Restriction visitor rewrite supports most complex restrictions. Change most lists to sets. Some mapper updates to deal with those changes

Restriction visitor rewrite supports most complex restrictions. Change most lists to sets. Some mapper updates to deal with those changes #43