Switch from ST to State

Allocation actually goes down quite a bit when using State instead
of ST.