Should I submit (a variation of) one of these patches to bug-gnu-emacs?
Or should I look into other solutions?