Clean up the logic for setting the DataSelection properties from the
children data choices