Optimize imports.
Add StrategyWrappedVariables.

Doesn't do much right now.
Merge remote-tracking branch 'origin/master'