Tweaks to the wysiwyg's expansion.

From #5360.