Few more rakefile tweaks.
Tidy rakefile.