Change the type of variant id to int in a few remaining places.