Add support for all kinds of numbers in E<>