Product shortcodes: addressing issues brought up in #6655