Fixed minor fallout after rebase.