Fix some incorrect macro usage and escapes.