Merge "More native code cleanup."