Factory fix pt2

The never-ending (until now) crusade to make factories look like they make sense.

Consistent use of traits, sequences, no duplicate factories and a smidgen of whitespace
OCD. Removal of some traits that made no sense (they were incorporated into the defaults).