And also
- Remove test on uninitialized value
- Change the class to be const-correct

Many simplifications remain to be done.