Removes some scary str() calls