Moving towards relocatable installs...  (and a few incidental features/fixes
while doing that)