Cleaning up Rakefile behavior a bit ... still a bit crufty...