Reorder EEP parser factory, to show what's already done