Fixes for ; not supported in mixin parameter lists #319 #320

I want to pull in this change for the mixin definition and then add support for mixin calls with semi colons