Some small cleanup from yesterday's commits.