Use plus-v format for some complex structures.
Merge pull request #2734 from erictune/cleanup2

Use plus-v format for some complex structures.