Improve recent CRuby rake compatibility