More irb goodness

Less duplication