Refines example, edits some macros.