Issue #27: got rid of Inf class and macros