More tweaking to cleanly support bin and run directories.