More consistency across shortcodes