Move from Journalist to BasicLogService.  Also whitespace in affected files.