Remove some unused macros. Constify. Minor style changes.