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

[Aaron Bentley]

Aaron Bentley has voted +1 (conditional).
Status is now: Conditionally approved
Comment:
That comment needs some rework.

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