Clean up some womky spacing issues.  #2252