White-space clean ups.