[MERGE] Refactor commit to prepare for population by tree walking

[Aaron Bentley]

Aaron Bentley has voted +0.
Status is now: Semi-approved
Comment:
The general idea looks fine, but I have some implmentation quibbles. 
See list.

For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C46849785.10902%40internode.on.net%3E