Generate DocumentComponents correctly.

Use a different style to avoid switching the arguments around again.
Merge branch 'master' of github.com:ciir/Proteus