Sync-up minor code edits with the default branch.