Record local usage in greater detail.
Fix tests.
Merge pull request #182 from mortardata/cmiller-record-local

Record local usage in greater detail.