Rakefile: Better handling of backwards-compatibility