feat: cleanup FSM code to contain real abstractions instead of directly applying low-level functions.

feat: cleanup FSM code to contain real abstractions instead of directly applying low-level functions. #1876