Various bug fixes for Ruby-1.9 or later.