Correctly scope figure/element styles.

AND-2109 also requires an additional MAPI fix.