Improve numeric objects handling.