https://github.com/weld/core/pull/1068 is now merged. Leaving this issue open for some more changes.