WP-2081: use margin instead of spaces.