Simplify modeling in progress state

[charisk]

Flatten the modeling in-progress state for methods since we don't really need the nesting and it just made things a bit awkward.

Checklist

N/A:

• CHANGELOG.md has been updated to incorporate all user visible changes made by this pull request.
• Issues have been created for any UI or other user-facing changes made by this pull request.
• [Maintainers only] If this pull request makes user-facing changes that require documentation changes, open a corresponding docs pull request in the github/codeql repo and add the ready-for-doc-review label there.