Update analysis code for #3261.