Untabify, class -> struct to avoid warning from MSVC, custom assert -> BOOST_ASSERT, remove superfluous semicolons