Replaced ThrowError with BOOST_THROW_EXCEPTION.  Fixed some style errors.
Merge remote-tracking branch 'origin/next' into error_info
Replaced some missed ThrowError instances with BOOST_THROW_EXCEPTION.