Added nothrow to in a couple of places.