Merge "Cosmetic reordering of FRAME_CONTEXT members."