Index into dictionary with addressing units, not cells.
Get rid of an ugly hack.
Add support for CONSTANT.