Added missing var on choice declaration.  Bug fixes for child add/remove events.
Catching unspecified max occurs