[PM] Use a simpler technique to drop optional analysis manager arguments