Updated spec to reflect what we ended up implementing.