Minor constraint change.
We don’t need to be explicit when having values that are read-write in the header.
Some code style changes.

Again.