WINTERMUTE: Further reduce the amount of int->int32-confusion.