Thanks for the bug report. Unfortunately, the fix for this will be part of a larger refactor that includes fixes for other issues. I’ve mentioned this recently in another thread:
For your particular issues, we have an existing bug report that’s not publicly visible yet (hopefully in a day or so):