You should address this before landing the patch; the current approach can, in theory, create a lot of garbage.