Replaced usages of type ConstructorArgument with its interface