Minor tweaks to assign and variable type system.