I'll fix this too.  Double-underscores violate the C++ standard.