fixing some missing some `_tostring` conversions, and also some bogus type annotations