We no longer put class variables in front, see "Taming the Kind Inference Monster" (also fix some markup issues)