More workarounds for some weird Drush behaviour.