Replacement for @raoulb pr#914

See #914

ToDo:
- [x] tests
- [x] final rebase
Maybe reorder either alphabethically or mathematically `(sin, cos, tan, 1/..., inverses, 1/...)`?