Re-adding type signatures for either variants