I'd say we should merge this as is. This PR already became complex enough.