- Established const-correctness.
- Inserted "override" where appropriate.
- Marked single argument constructors as "explicit" where appropriate.
- Minor cleanup of using directives.

This reverts commit 83e500a9.