FYI I think the patch failure in the cfbot is spurious because thecfbot got confused by Erik's patch.