Remove extraneous semicolons.
Update to work with most recent libstd