Some small cleanup commits.