Eliminated needless uses of `tr`