Remove deprecated macros.
Fix spelling and markup.