Merge "Remove references to kernel macros."