Martin Kouba I opened https://github.com/weld/core/pull/1616 with the change. It that approach looks ok, let's reopen this issue.