Enforce variant type.
Avoid various warnings.
Merge branch 'master' into linear_allocation