Ruby 1.9 compatibility fix. Added an option for reduced redundancy.