Code review cleanup for r175697