minor tweaks to Mike's eacb2ba98fcdfcceae093050d46a02dfc63a1ac5
"Use Phis for expression metavariables ..."

Also added some %'s after some macros to get rid of some redundant
spaces on the page.