The ifdef should be removed. It'd be good to add a verbose message that tracks how large the merges are becoming. Should I open an issue to track that, rather than attempting to get it into the branch?