ENH: Margin tightening.

More efficient use of whitespace.

Change-Id: I8eac58e4bdf6a33cb4765b87e32ea5f0f3a97f2f
Merge "ENH: Margin tightening."