Yes. That is the full niddesa version.
– Thank you for pointing that out, Lang!
It is also important to note that the Akusala-mula PS process starts when the mind attaches to an arammana. That is discussed in detail in the post:
“Difference Between Tanhā and Upādāna“