Fix up the trustifier a bit.