Use CFG/bounds code to get rid of dimensionality hack.

i.e. properly look it up/infer it from the surrounding code, as we
promised we'd go.

(I had to hack it for a demo, earlier.)