A few changes to make jigsaw more 0.7.0 compatible

Have not actually tested yet. Specifically, haven't checked to see if
the 0.6.5 change (which makes file-level "var"s file-local) breaks
everything... it probably does.