Cleanup, updated gpt.h from gpt-10 at opensource.apple.com/source/gpt