Changed handling $ (self) argument in calling convention.