More work on "abstract factory" template classes