More changes to get to ruby_next.