More Rakefile refactorings...