Add dependency on message and service generation being complete first.