Silence a warning.
Some style.
Fixed some indentation.
Create DNF for selects.

Constraints are converted to DNF later on anyway, so I might be better
to create them in DNF.