sicarul Improve handling of variable types.