Running on Ruby 2.0.
Simplification of code, more to come.