I've renamed and added comments as I said I would above - see 9429abb2dc4a8fbaa184c49b125ebb71f63f0da4.