Mike Christie [off-list ref] wrote:

One question on the target part I had is about the TODO above. Is that
something you were going to do, or is it something you are asking the target
people to do?

I've got an in-progress patch for that, but it's not the simplest code to
modify.  I'm holding off on completing it till the simpler cleanup is in.  I
might end up having to push the incomplete patch your way to ask for advice on
how to complete it.

David