Update [v2] cocoa.m to match new DisplayState code