!fixup Little corrections of the stateful <-> stateless conversion module.