Update bits around related workflows to play nice with legacy models from Alvex 1.2.x