Fix AI breakage

This code was generated using AI and it has a nasty habit of making unrequested changes. This release attempts to catch those.