A few changes, mostly to introduce a sourcefile field and ability to get a 'fqn' for each block.