Changed validatorTypeForIdentifier function in ValidationUnit to return an optional instead of explicitly unwrapping the return value.