ContainerBuilder: improved generated factory parameters resolution [Closes #17]