Refactor lockstep and simplify opApply string mixin generator.
Merge pull request #1124 from AndrejMitrovic/RefactorLockstep

Refactor lockstep and simplify opApply string mixin generator.