Add --no-print-directory to pgmake options by default.

Other minor edits to keep variables local to the functions they're used
in.