Cleaner workaround than last change.
Fix another Xilinx sensitivity list issue.