Code review fixups.