Use only shorthand properties for margin and padding

Blocks could accumulate conflicting shorthand and per-side margin/padding properties; spacing now uses only shorthand.