I don't know what to do with the CF entry itself. I could change the status to "waiting on author" but then the design draft may not get enough attention. So I'm leaving it in the current state for others to look at.
I'll try to update patches as soon as possible. Little code cleanup will be useful regardless of final refactoring design.
I'm marking the patch as "Returned with Feedback". I assume you'll submit fresh set of patches for the next CF anyways.