Fix circular argument reference warnings for ruby 2.2

Thanks to @seanhandley  for helping me sort out the commits.