Tweaks before a major change to hxlox.