Fixed callback calling conventions (part 2).