Spec changes left out from previous commit.