Yes, this way preserves the existing behavior more closely. Fine.