Issue #311 - Remove more whitespace.