Improvements to elaboration panel logic.