Bring the engine in line with changes to GLM.