Just to check this off, this has been reworked in the soc2013/composite-fields branch.