ruby21.y: track upstream refactoring.

Original commit: https://github.com/ruby/ruby/commit/12a0b0c8f48f168994245198e62d1d40cab5d594
Add TODO with relevant upstream commits.