emgm-company: Rework things to allow more ad-hoc cases