[CB-2677] Whitespace cleanup and convert tabs to spaces.