Potential fix for #88 and improvement to Ruby 2 macro def