[#530] Refactor to avoid destructive changes to shared files.