Well it is the right place IMHO, considering the fact that this is the only place output ports are created once. Oh well, maybe it isn't entirely true, but that's outside this round of refactoring work, I'll avoid regressing that part for now :)