Replacement for @raoulb pr#914

See #914

ToDo:
- [x] tests
- [x] final rebase
`eval` is usually the first or second method in a class.