Corrected variance on Validator, switched CollectionContext to support collection-like constructs (e.g. Options) and added DSL tests for Options.