Not going to address this in the old bytecode enhancement code. But I have planned for this in the design of the new bytecode enhancement code. See HHH-8558 and HHH-8559