fix handling of infixes and literal numbers