Move things around to make plugin work better.