Minor rearrangements in install-local