Small code deduplification tweak