Readdress review comments after botched rebase.