WINDUP-240: Port Brad's Spring Visitor to Windup 2.x