Extra paragraph tags in an enclosing shortcode

OK, it seems someone has trod this path and there is in fact….
shortcode_unautop()

Job Done. It looks elegant in the editor and works in the output.

The shortcode now looks like this;

function column_shortcode($atts = [], $content = null)
{
   $content="<div class="two-column">".$content.'</div>';

   $content = shortcode_unautop($content);

   return $content;
}

add_shortcode('two-column', 'column_shortcode');