Hi Colin - thanks for the implementation note here. I agree completely that this implementation is peculiar and unhelpful to readers. I didn't make too much more effort with it since this code is "relatively temporary" and should be swept away completely with a much clearer (and more reliable) implementation once http://issues.fluidproject.org/browse/FLUID-4925 is implemented, which we expect almost immediately in the roadmap after the Infusion 1.5 release.