Extend the numerical constructor to accept all built-in numbers
Improve the function annotations