Thanks! I do believe the old patch (the one I hadn't touched) was broke -- I was deleting it, doing an svn update to pull in a new copy, not doing anything with it (not looking at it in an editor), kept getting the same error.