I really like your proposed issue-fixes. This should be fixed as soon as possible.