RUBY-646 additional changes that would probably be good