Don't map the model (or id) to an integer, even when it looks like an integer.
Fixes #1