Code review cleanup.