More cleanup.

Finally standardized difference between ‘spacing’ and ‘margin’.  Margin
handles attachment to form edges, spacing handles inter-control spacing
inside the form