I absolutely agree, this should work without breaking anything. Should I prepare a new pull request including these changes? Or should we postpone this for an patch focused on performance improvements?