Fix extraction action for VirtDir and simplify.  Remove no longer needed visitor.