I got it in the merge, just a few lingering c++11-isms.  Also a == b == c does not do what you think it does.