Further cleanup whitespace.