This is covered by the changes to `x_module.py`