Excellent, thank you guys.  Rachel: as for your plans above, I think they sound very good.  The `takes_cf` idea sounds to me like it would work...