One more static + whitespace cleanup.