Merged dtrace fix.