WINDUP-243: Port Brad's Archive Hash visitor to windup 2.x