Experiment with making it possible to map from multiple calls to a single set of constraints
Fix typos in SuitedToPlay causing failures in previous commit