Cleanup.
Fixed SpellFlyout for Bar1.
Merge remote-tracking branch 'orig/master'