Fix mishaps resulting from rebase.