Allows me to remove extra space, and ultimately extra <p> and <br>, from shortcodes.

shortcodes-remove-wpautop.php

// We have to remove the default shortcode filter
remove_filter( 'the_content', 'do_shortcode', 11 ); // AFTER wpautop()

// Strips extra space around and within shortcodes
add_filter( 'the_content', 'shortcode_cleanup', 11 );
function shortcode_cleanup( $content ) {

    // Clean it
    $content = strtr( $content, array( "\n[" => '[', "]\n" => ']', '<p>[' => '[', ']</p>' => ']', ']<br>' => ']', ']<br />' => ']' ) );

    // Return the content
    return do_shortcode( $content );

}