Improvement in code size -- 944 bytes.

Some day I will understand C++11 well enough to do the right thing the first time.