Style and ruby 1.8 compatibility fixes.