Make policy printing optional.

Minor code reorganization to avoid printing policy for local dump.