Revert "StateMachine: Move static defs outside class"

This reverts commit 698aa3d69a7ec79fd60747bed0fad32f175a2984.

Signed-off-by: Chris Evich <chris-cxx@anonomail.me>
StateMachine: Fix non-integral def. init.

Signed-off-by: Chris Evich <chris-cxx@anonomail.me>