[COMMIT] Reduce narrowing warnings, catch non-idempotent arguments to make_integer()