More types now boxable.

Fixed but when adding constant to variable.