Fix Simplicity classes

https://github.com/t11e/simplicity/issues/31