unit: handle generator subscriptions earlier
Merge pull request #796 from bcwaldon/793

Reorder subscription management in UnitStateGenerator