Fix accessing :more? on Ruby 1.9.3.
Minor refactoring to reduce the complexity.
Merge branch 'fix-complexity'