More fixes to rip out all of the v2 directory code.

(This was a squash commit, but I forgot to squash it. Sorry! --Nick)