Get a little more output and timing data. #3594
Correct setting of LOCAL_DIR to exactly where we want it and not
a merged string with an arg and toplevel combined. #3594