Replacement for @raoulb pr#914

See #914

ToDo:
- [x] tests
- [x] final rebase
> Why is there a newline here?

pep8, probably

> Doesn't it also automatically evaluate for everything in the cst_table

Yes (also, 0, +/-1, nan and +/-oo).