Bringing WYSIWYG inline with some of the master changes.