The FIXME you refer too is for when changing from one STONITH mode to another. So it's slightly different. I do believe that the STONITH resource I mentioned should be deleted here.