More syntax fixes for non-2.0 ruby