Simplify the factory definition processing.