Deal with alread-normalized ints

[See #1308][See #1304]