Pre-Optimisation Backup

Many small changes everywhere, in response to some practices highlighted
in the Effective C++ book.