Bring our code and specs in line with the docs.