Sure, I'll merge as is... but this must be fixed. If not for perf, then for readability.