Restore some int casts so we don't capture unnecessary strings