Minor shortcodes tweaks

Please check out the individual patches.

Fixes #29331 (closed) along the way. I couldn't find any other cases we might need to throw.