Added some code to deal with mixins that have arguments that refer to other arguments for their default value