Updated for FitNesse master.