Reformulated defintion containers.
Corrected errors in syntax.
Change-Id: I697bb9d4a87bafc20cf4b26bf02872f3326cbbb3
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>