Reintroduce the StState and StRWS newtypes