Follow the spec more closely.