Track master. Removed explicit ToStr impl.